[PATCH] QFileSystemEngine: handle copy_file_range() returning ENOSYS error

This shouldn't have happened, because minimum-linux_p.h would have
declared our need for a Linux kernel 4.5 or higher. I think the issue is
not the kernel, but a container wrapping the Qt application and
filtering system calls for security. If this container hasn't been
updated to know about the system call, it may cause an ENOSYS error.

Because we now handle the condition, this commit removes the 4.5 minimum
Linux version requirement from minimum-linux_p.h.

[ChangeLog][QtCore][QFile] Added a workaround to a compatibility issue
of the copy() implementation in some containerized Linux environments,
which could cause the file copy to fail with a "Function not
implemented" error. This is believed to be a bug in the container
runtime, not Qt, in that the container wrongly filtered the
copy_file_range(2) system call that the Linux kernel supports.

Fixes: QTBUG-144142
Change-Id: Iedbf805486ad79e7127dfffd22043889359563fd
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit b1b45ca4441db9e880e3a7fc7f4e8aa3af870eb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7b8591ac572079e59f856fb0ac7f4e3312f6dd43)

Gbp-Pq: Name upstream_QFileSystemEngine-handle-copy_file_range-returning-E.patch

diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h
index 86226326fe50d2ed872c26b296c214db2b802fe4..b2c74c5c37cfa2faf93a5e9af52f70fc5e0fad23 100644 (file)
--- a/src/corelib/global/minimum-linux_p.h
+++ b/src/corelib/global/minimum-linux_p.h
@@ -41,7 +41,6 @@ QT_BEGIN_NAMESPACE
  * - accept4                    2.6.28
  * - renameat2                  3.16                    QT_CONFIG(renameat2)
  * - getrandom                  3.17                    QT_CONFIG(getentropy)
- * - copy_file_range            4.5                     QT_CONFIG(copy_file_range)
  * - statx                      4.11                    STATX_BASIC_STATS
  */
 
@@ -51,10 +50,6 @@ QT_BEGIN_NAMESPACE
 #  define QT_ELF_NOTE_OS_MAJOR      4
 #  define QT_ELF_NOTE_OS_MINOR      11
 #  define QT_ELF_NOTE_OS_PATCH      0
-#elif QT_CONFIG(copy_file_range)
-#  define QT_ELF_NOTE_OS_MAJOR      4
-#  define QT_ELF_NOTE_OS_MINOR      5
-#  define QT_ELF_NOTE_OS_PATCH      0
 #elif QT_CONFIG(getentropy)
 #  define QT_ELF_NOTE_OS_MAJOR      3
 #  define QT_ELF_NOTE_OS_MINOR      17

diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index 94349295d5e20db4df7ee972bba57ea271128136..5c2de01c59d0b8b93c601b05b4b408d7df6fc1e7 100644 (file)
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -1204,6 +1204,7 @@ auto QFileSystemEngine::cloneFile(int srcfd, int dstfd, const QFileSystemMetaDat
     switch (errno) {
     case EINVAL: // observed with some obscure filesystem combinations
     case EXDEV: // Linux can't do xdev file copies (FreeBSD can)
+    case ENOSYS: // caused by some containers wrongly filtering the system call
         break;
 
     default: